Bug fixes + rework of BasicSupport