Converted everything to new hash syntax