Updated to reflect changes from elpp v9+