Updating the converters to work with new modifications of architecture.
TODO: Update main convert function