Prepare implementation for #61