Refactor + Script trigger
Fix model panics