API refactoring (easier to understand, and renaming as "norest" (No REST API) )