Expanding some methods