Changes to make lib definitions