Updating how params are extracted. Resovled #37