Added configurable visibility and modifier