Feature/callback review