MOD. refactoring API