Moved feature into separate file