Implemented some facade methods.
Fixed generics at some places.