update core with better argument detection