Added custom entity