Fix #17 by using non-deprecated methods