Changed API - added converters