Refactor initial features