Centralise noops, more dependencies