Added refactor, reflection