Updated to newer revisions and added consumer sink

Fixed NPE