Updates from Sound branch
Updated MapDirection to match sound classes