Added support for builder rank
Extra builder stuffs