Refactored API to use fillItem()