FIXED: Add basic data inputs and categories