Updated to work with 0.9.3 and added config options