+ Add generics support.
- Remove unused extensions.