Interface changes

Fixed some interface stuff