Fixing standalone
Adding pointer to dispatcher concept