Added translation infrastructure