Small changes: adding 2 "@property" where it was needed