Added custom entities