#516 Improve consistence in the interface