Data type change

Made the data types of the controller mappings to be consistent with the data type accepted by the function they're passed to