Commit to save
Added ServerHandler