Some refactor and more demos