Implemented new fetch-constant and fetch-class handling