Updated to make go packages work