Working on api improvement