Add xip support