Feature/conversion api