Issue #192: Speed-up the application startup