Added enabled checks for endpoint - see #141