Update utilities and add change grid namespacing