Interim version with new keyref 
dependencies are not working properly.