Adding Application layers for mapping entities