Draft: preparing for units support