added entity module for mapping