Initial modifications for new Library