Simplified some generate methods