Common and client added