Splitting properties to multiple lines, adding more #defines