Migrate Circle and Category to lombok