- Removed some unused references.
- Added Contains() functionality