ADMIN - Submit functions refactoring