Migrated seperate property/selector arguments

Migrate seperate property/selector arguments to compact single argument
with dot notation.