Improved table support and added compatibility for Confluenceu pdate