Added attributes and passed in a couple of params