Limit to the first entry points

Refs #223