Updated for developers