Improve core and analyzer for work with seconds