Added third party components back in