Added initial support for specifying mci