Added more options and documentation