Add Entity and Config classes