Added handling of stock content classes