Minor fix
Major improvement
Major refactor
Major refactor
Update properties