Replaced Parameter infrastructure with Properties
Removed Parameter infrastructure