Adding build qualifiers back