Add support to app context