Moved properties to baseclass