KD: Added user entity, account entity