Fixed three @param data types