Change to use the common class