Replaced some chars and strings with constants
Added sign unwrapping for compound integer datasets