API return refactoring mk1, dict inception