Added items not to be implemented in first version.