Master Spec version
Added getters and setters