This will allow the simplification of data structures and the enventual removal of the castor namespace.