Cleanup use same method for GET and POST