Added a few conveniences