Added typed accessors