Added new scripts to further 'isolate' responsibility