Added land aspects and added a decorator feature