Added some Interface code