Better consistency on manifesto