Core engine refactory