Fixes + static class callback + Custom Commands