Added chart components and some more utils