Use bounded dictionaris (#491)