Fix issue #188 (Automatically listifiy endpoints)