Native Query Support

Change-Id: I3afbba7a388f814bdb0fe9f9a5dcc3d99203134a