Removed redundant declarations.
Changed cursor to use enums instead of strings.
Updated Fayde package with cursor type as enum instead of string lookups.