Add proper critical level and interval - complete v0.1