Add some modern niceties