More modifications
Added arguments of kernel components