New terminal station with machine and fix for sql builder