Add Nicer Models for User Code