update interfaces and models - fixed #4, closes #1