Incorporating the redefined classes