Update in connection to core / improved some ex.