Add Route stuff and cleanup in Instance and Resource