Feature/api draft