Adding framework classes