Updating VikingLibrary to improve integration