Fixed interface and functionality.