Changing to avoid arrays on the module interface