Added new ComparableWrapper in 'core'