Change to generic properties