Added user and account entity