Removed final modifier from connect method
Added logic for topology options classes