Feature/bucket api