Added a few more extension