Finish up CoreModule