Move commands from server to core