removed xstream dependency and refactoring