Add proper 'goto' methods