Greatly simplified library scope