Added Problem & EndCriteria classes