Added core code