Removed dependency on User class