Added property key --> id mapping in StatementContext. Tests coming soon