APIUser improvements