Updating core code and adding server sample file as example