Fixed automatic state discovery
Added TODOs to find places for manual intervention
Setting platform to either of the options