Define props in a more consistent way