Added entity module