Implemented more props