Added code for proper library initialization