erd and some modification (namespace)