Adjusted CommercialBlockFactory to include current_position