Updated code to be compatible with EVELink-0.4.0