Added Service Provider info and updated beans