Revert "The following have been seperated in attributes list:"

This reverts commit b6fbba391c1d5ce355a1b699c3259d29be52181c.