added references support