Add policy for register and design fix