Added features for aiding documentation