More base components added