Moved property scoping to correct place