Adding some cursor-related stuff