Added abstract custom entities