Adding interfaces
Adding test
Rename