better approach to #46 and converted Admin API up to A7