Changed API interface