Add some niceties