Added getter, changed options