Fixed mistakes
Update interfaces