add additional omap related changes