Added success handling