Added modules to DRY up the code in the models