Moving to a more standard and strict API.