Remade the bundle to be more symfony-like