Get rid of Constants interface