FIX: Added more utility items