Not more neccesary to include an empty map
Order functions parameter changed