Added allow null option