Separated and finished user api