Refactored some properties to arrays