Changing queries to return Row object...