major updates based on commons refactoring