Further additions for library generation.