Changed some methods to return a Vector instead of a List.