Add availability indicators and utility function