Add support context & remove development context