Added a few handy features