-Refactor properties to separate table