Added missing interfaces
Merge pull request #40 from inspiran/refactor

Added missing interfaces