Refactor: Remove Common Api and use BlackMagic all the time