Added html serialisation support