New class and new hbm for GCategory updated.