Added better assemblytyperesolver