code refactoring
updated common libs