Change API of the user section a bit. Not fully implemented yet