Modified handler structure to support self contained modules