Feature/rnair/bees 25