Updated Builder pattern to be more logical and generic, but still quite explicit to the instantiator of the aircraft