Added getters / setters and options