Updated model to exclude empty values