Interfaces fixes and added properties