@User would be happy to help out further since we have not yet optimised for API overriding but will do this soon.