API cleanups
Adapted API according to #35 but implementation is not yet done
Case when API cleanup