Separated features into separate class.