Added more sinks and started using __all__