Update use of OTP behaviors