Educational Suite: Performance update

Multiple performance improvements has been applied.