Incorporate new standalone features