Initial OWFS changes