More Completion Changes

Added more changes to support different brewing methods.