Updated to work with bamboo fed data