Some features added, avoid using commit msgs like this