Library components I

Added certain library components to fix script mapping.