Added few more changes to Library