Moved conversion into frontend