v1.0 Changed architecture and options