Added attributes support. Revamp 2.0.0