Updates for code refactoring
incremental update