Title: Performance improvement