Refactor: change ellipse to features