Fix #36 Additional exposed properties