Added "attrs" fix and new just "options" feature