Add some validations, change old hash syntax to new one