Simplified some methods