Added ability to use nested attributes