Added WebService & Design improvements