Move profile methods to right place