Refactored to remove Spring Roo and ITDs.