Add ability filter. Fix some interface issues.