Closes #190 - Move type conversion