added User and Record entities