Adding more extension classes