Added models and structures options