Improved options and optional callback handling