Fixed Buddy model; using it in generator