Added APP_DIR