Add better instance control