Added interface to simplify testing