Refactor. Add properties.