Adding more functionality such as LWA, etc to Grid