Added static mode support