Cleaned up availability definition