Trying to make build faster