Librares update & refactoring