Improved implicit conversions and refactoring