- Removed dict dependency