Restructure to enable overlaying models
Added error handling