Added design for the additional entities