Added bucket class