Better structure, introduce more models