Added a few more options and attributes.