Add implementation done in TestUI to Core