Optimised argument name resolution and added additional enum data methods