Adding availability flags
WIP