Updates to use the more standard methods