Adding proper visibility support