More typerequirement weaving in