Small structural changes
Design improvements