Just few type additions..