Fixed an error in the query
Added missing dependency
Fixed default properties
first (not fully tested) version
initial import