Moved to use common::sense