Resolve #10: add more views