Core methods improvement