Move buff data to it's own class