Moved the subscription parser to the correct place