Improve visibility and extension possibilities