Context fixes and adding 'last' method