[MOD] Options handling, better typing