[GS] Modifications to integrate with bitshares_toolkit