Removed pipe and updated classes