feature/use-common-availability