Adding static mode

Change-Id: I44f74859b6c6b0b0d385df13be0141e050887ffe