Support for apps and all that
Update name