@EWD-687 -> Add auto resize