Added Data container and introduced smart fix for slow data rendering.