Added all Getters/Setters to prevent JSON mapping issue

See issue #76