Moved properties to own file