Merge some changes from refactor branch