Added OTP source and header