Add properties
Revise sources