Reordered compilation code
Fixed interface class default values to be per-instance