Code refactoring. Placeholder object selector added.