Changed assembly lifecycle mapping and other minor fixes