Add safty and include for labraries