Made changes to reflect Concept API