Add half of functionality required for #476