Cell Source and classes with constructors
Fixed cell source registrations