Morfy Core Improvements