Further additions of core stuff.