Added new modules, custom and payment