Adding minunit support