Add database
Clean up item types