Add new conversion and refactor