Refactor library objects