Adding few more components