added tag and stripped PropertySchema usage