Some refactor and changes