#143 Options added and Integration