Adds additional checks and renames some params