Extracted a single feature into a separate class