Addes support for attributes json