Use properties not hashmap