Make elements optional to help debugging