Adding support for changing method in admin (+ refactoring to better handle this change)