Switched away from html preserve
Removed dependency on pojo