Added a generic name for custom entry of class