Moved conditional class