Changing API to be more REST friendly