- Migrated to uf 0.5
- Fixed NPE