Fixed the aliasing loop to use list comprehensions
Added props helper