Separate decorator module, added "from" and "extend" decorator type.