Fixed a bug relating to Properties and Parameters adding twice.
Created new abstractions for Properties and Parameters