Split out bees and restructured with records