Revert "Updated components class"

This reverts commit 8c91c11e6cf4967a25d774a379e5d7cb98e444e0.