Added ContentBundle support.
Updated files.