Added all bucket classes