Improved gulp strucuter