Modified for User API check