Added static controller support