Added composite endpoint support