Added missing entity mapping