Add optional bounds limit for window