Refactor; Interface utilities