Refactored into concrete5 package