Added visibility and inline attributes