Adds some helpful features