Models are now more fleshed out