Fixes Package Values and improve visibility