Make more portable