Interfaces fix