Add standalone functionality