Add initial features for discussion