IMPORTANT / Fixed issue with PrimitiveRole support