Refactored to use Integer as ID instead of Long