Added allow empty