Move conditions into class namespace