Allow a bit more complex expressions