Added type prefix (if present)