Fix some concerns, introduce optional as dependency