Adding Maxwell support