PSTypes refactored using bitmasks