Added instance variables for optional metadata