Updated to community use case