[FIX] dict needs to be encapsulated