Minor changes to function hierarchy