Added parameters and extended pyzor/razor