Import tweaks and add a few helper constructors