Add APIUser
Code cleanup