Added all basic functionality in services and repositories