More strict and ui-lib conversion