Open 311 refactoring and libraries update