Upgraded Primitiveable
Refactored and Added dependency on Common