Bundle Extension refactored