Implemented more NursePP features