Added a few general extensions