Updated PM feature