Moving properties to the generic module