Getters updated and cleaned
Multi platform support draft