Changed metric module support. Now working