Added options handling again.