Added builder class