Updates for using as imported module