Added classes
New builder, added classes