Re #68 - Fix issue with importing endpoints