Now supports old an new APIs