Add proper class separation