Work in progress: Better handling of CDMI vs non-CDMI calls

This is triggered by #3