WIP: Make extension optional