Rework core (version 0.3dev).