Some more external sub-classing and code re-use support

Some more external sub-classing and code re-use support