[Core] Improves dashboard handling