Added Guard; Added port support