Adding some nifty stuff