core refactoring FromToPeriod added