Added more HTML features