Feature refactor methods