Adjusting for Express 4.0 support