moved properties to separate source file