Broke the define blocks into smaller modules