Added getters and builder
Made all builders package-scope