Add simple state limits and log