I personally hope they make no changes to the Armoury system itself and instead just add the Job System ontop of it so you can pick your Weapon Class and your Job class.