Add coverage and less gready requirements