Updated version: a bit simplier interface and storage