Make more stuff automatic