Added helpers for build and fake data