Refactored the get/add methods.