cleaner solution for dynamic model discovery