Continued working on Core