updates for standalone gem support