Added abstract server
Little fixes