Minor whitespace change
Updated dependencyobject to support other scenarios