Added PropertyHolder class