Make engine more extendable