Updated for Endpoint 1.0.2