Add types for Uppaal definitions
:bug: resolve conflicting types