Added column markup and free marker.