Change signature for much nicer syntax