Another minor change: complete separation from framework