Refactor Properties.Module